From: Camila Ayres <hello@camilasan.com>
Date: Mon, 17 Feb 2025 15:47:15 +0000 (+0100)
Subject: Disable the option to select an update channel when server has a valid subscription.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~53^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=69551c6e2500ba94bb66e807541ae7408d7ade15;p=nextcloud-desktop.git

Disable the option to select an update channel when server has a valid subscription.

Signed-off-by: Camila Ayres <hello@camilasan.com>
---

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 843be0dd5..d6aec9821 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -327,12 +327,13 @@ void GeneralSettings::loadMiscSettings()
 void GeneralSettings::loadUpdateChannelsList() {
     ConfigFile cfgFile;
     const auto validUpdateChannels = cfgFile.validUpdateChannels();
-    if (_currentUpdateChannelList.isEmpty() || (_currentUpdateChannelList != validUpdateChannels && !cfgFile.serverHasValidSubscription())) {
+    if (_currentUpdateChannelList.isEmpty() || _currentUpdateChannelList != validUpdateChannels){
         _currentUpdateChannelList = validUpdateChannels;
         _ui->updateChannel->clear();
         _ui->updateChannel->addItems(_currentUpdateChannelList);
         const auto currentUpdateChannelIndex = _currentUpdateChannelList.indexOf(cfgFile.currentUpdateChannel());
         _ui->updateChannel->setCurrentIndex(currentUpdateChannelIndex != -1 ? currentUpdateChannelIndex : 0);
+        _ui->updateChannel->setDisabled(cfgFile.serverHasValidSubscription());
         connect(_ui->updateChannel, &QComboBox::currentTextChanged, this, &GeneralSettings::slotUpdateChannelChanged);
     }
 }